Build tweaks for xenlinux/ia64

diff --git a/linux-2.6-xen-sparse/arch/ia64/Makefile b/linux-2.6-xen-sparse/arch/ia64/Makefile
index c7a4d7eec7b3d3d96524dab741dd4ed298766941..e0751e9328b89efb062fdf0a7be842d9e99b0043 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/Makefile
+++ b/linux-2.6-xen-sparse/arch/ia64/Makefile
@@ -87,9 +87,9 @@ archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
 
 CLEAN_FILES += include/asm-ia64/.offsets.h.stamp vmlinux.gz bootloader
-CLEAN_FILES += include/asm-xen/xen-public include/asm-ia64/xen/asm-xsi-offsets.h
-CLEAN_FILES += include/asm-xen/linux-public/xenstored.h
-CLEAN_FILES += include/asm-xen/linux-public include/asm-xen/asm-ia64/hypervisor.h
+#CLEAN_FILES += include/asm-xen/xen-public include/asm-ia64/xen/asm-xsi-offsets.h
+#CLEAN_FILES += include/asm-xen/linux-public/xenstored.h
+#CLEAN_FILES += include/asm-xen/linux-public include/asm-xen/asm-ia64/hypervisor.h
 
 MRPROPER_FILES += include/asm-ia64/offsets.h
 
@@ -102,7 +102,7 @@ include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
 
 arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
 
-XEN_PATH ?= $(srctree)/../xen-ia64-unstable.hg/
+#XEN_PATH ?= $(srctree)/../xen-ia64-unstable.hg/
 include/asm-ia64/.offsets.h.stamp:
        mkdir -p include/asm-ia64
        [ -s include/asm-ia64/offsets.h ] \
@@ -110,14 +110,14 @@ include/asm-ia64/.offsets.h.stamp:
        touch $@
        [ -e include/asm-xen/asm ] \
         || ln -s asm-ia64 include/asm-xen/asm
-       [ -e include/asm-xen/xen-public ] \
-        || ln -s $(XEN_PATH)/xen/include/public \
-               include/asm-xen/xen-public
-       [ -e include/asm-ia64/xen/asm-xsi-offsets.h ] \
-        || ln -s $(XEN_PATH)/xen/include/asm-ia64/asm-xsi-offsets.h \
-               include/asm-ia64/xen/asm-xsi-offsets.h
-       [ -e include/asm-xen/linux-public ] \
-        || ln -s $(XEN_PATH)/linux-2.6-xen-sparse/include/asm-xen/linux-public \
+#      [ -e include/asm-xen/xen-public ] \
+#       || ln -s $(XEN_PATH)/xen/include/public \
+#              include/asm-xen/xen-public
+#      [ -e include/asm-ia64/xen/asm-xsi-offsets.h ] \
+#       || ln -s $(XEN_PATH)/xen/include/asm-ia64/asm-xsi-offsets.h \
+#              include/asm-ia64/xen/asm-xsi-offsets.h
+#      [ -e include/asm-xen/linux-public ] \
+#       || ln -s $(XEN_PATH)/linux-2.6-xen-sparse/include/asm-xen/linux-public \
                include/asm-xen/linux-public
        [ -e include/asm-xen/linux-public/xenstored.h ] \
         || ln -s $(XEN_PATH)/tools/xenstore/xenstored.h \

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
index 382245494a344782240997681ba62cdf26b77b86..8dd4a0c0496dd899c1369d051d93d58aeaf98cf2 100755 (executable)
--- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
@@ -1,9 +1,14 @@
-mv arch/xen/kernel drivers/xen/core
-mv mm mm.x86
-mv net net.x86
-mv kernel kernel.x86
-mv arch/xen arch/xen.x86
-mkdir arch/xen
-mv arch/xen.x86/configs arch/xen
-mv include/asm-generic include/asm-generic.x86
-mv include/linux include/linux.x86
+#!/bin/bash
+if [ -e mm ]
+then
+       mv mm mm.x86
+       mv net net.x86
+       mv kernel kernel.x86
+       mv arch/xen/kernel drivers/xen/core
+       mv arch/xen arch/xen.x86
+       mkdir arch/xen
+       mv arch/xen.x86/configs arch/xen
+       mv include/asm-generic include/asm-generic.x86
+       mv include/linux include/linux.x86
+fi
+cp ../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/